diff --git a/image_annotate.module b/image_annotate.module
index 9dc12bf..b494c23 100644
--- a/image_annotate.module
+++ b/image_annotate.module
@@ -174,8 +174,7 @@ function theme_image_annotate_formatter_image_annotate($element) {
     // Load all the JS and CSS magic
     drupal_add_js(array('imageAnnotate' => $settings), 'setting');
     jquery_ui_add(array('ui.resizable', 'ui.draggable'));
-    //drupal_add_js(drupal_get_path('module', 'image_annotate') .'/tag.packed.js');
-    drupal_add_js(drupal_get_path('module', 'image_annotate') .'/tag.js');
+    drupal_add_js(drupal_get_path('module', 'image_annotate') .'/tag.packed.js');
     drupal_add_css(drupal_get_path('module', 'image_annotate') .'/tag.css');
     
     $class = 'imagefield imagefield-'. $field['field_name'] .' image-annotate-'. $field['field_name'];
diff --git a/tag.js b/tag.js
index 0cc24dd..dff17be 100644
--- a/tag.js
+++ b/tag.js
@@ -102,11 +102,11 @@ Drupal.annotativeImage.prototype.addNote = function () {
     // Create/prepare the editable note elements
     var editable = new Drupal.imageAnnotationEditable(this);
     // Load the form and set the draggable/resizable area
-    editable.note.load(Drupal.settings.basePath+'image-annotate/create/' + this.nid, {}, function() {
+    editable.note.load('/image-annotate/create/' + this.nid, {}, function() {
       Drupal.behaviors.collapse(editable.note);
       var form = $('#image-annotate-edit-form form');
       // TODO: remove these *EVIL* fixes
-      form.attr('action', Drupal.settings.basePath+'comment/reply/'+ image.nid); /* Evil! */
+      form.attr('action', '/comment/reply/'+ image.nid); /* Evil! */
       $('#image-annotate-edit-form input').attr('for', ''); /* Kicking babies evil! */
       // Add the image note information to the form action on submission
       form.submit(function() {